From d065ee48e64b6a68ffd7713a3fc3046d12321aca Mon Sep 17 00:00:00 2001 From: Hans van Kranenburg Date: Sun, 10 Feb 2019 16:35:20 +0100 Subject: [PATCH] xen init script: move init_dom0 into xenstored start Executing this is only necessary after starting xenstored. In all other cases it just prints noop spam to stderr. -# /usr/lib/xen-4.11/bin/xen-init-dom0 >/dev/null Dom0 is already set up I don't want to silence stderr, so just move the code into the end of the xenstored start function. Also, add a hint that the compatibility if/else part should be removed after the Buster release. Signed-off-by: Hans van Kranenburg Acked-by: Ian Jackson --- debian/xen-utils-common.xen.init | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/debian/xen-utils-common.xen.init b/debian/xen-utils-common.xen.init index 7fd18e8030..e16d263def 100644 --- a/debian/xen-utils-common.xen.init +++ b/debian/xen-utils-common.xen.init @@ -256,14 +256,13 @@ xenstored_start() if ! [ $time -lt $timeout ] ; then return 2 fi -} -init_dom0() -{ - log_progress_msg "init-dom0" + # Add some extra entries about dom0 into xenstore if [ -e $ROOT/bin/xen-init-dom0 ] ; then $ROOT/bin/xen-init-dom0 > /dev/null else + # xen-init-dom0 has been present since Stretch. + # Remove this compatibility section in Buster+1 xenstore-write "/local/domain/0/name" "Domain-0" xenstore-write "/local/domain/0/domid" "0" fi @@ -294,11 +293,6 @@ case "$1" in 0|1) ;; *) log_end_msg 1; exit ;; esac - init_dom0 - case "$?" in - 0|1) ;; - *) log_end_msg 1; exit ;; - esac qemu_start case "$?" in 0|1) ;; -- 2.30.2